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

Change-Id: Ie448d5c45d06a3d394fb3e941d6657ca6b362cca