Merge "Exclude debuggable test config for 660" am: 60c730ab85
am: 7cdcb2b380

Change-Id: I140f3412f482353a366b36deb61ba550f7121b9b