Merge "Revert "Exclude debuggable test config for 660""
am: 19b5915599

Change-Id: I5953fd0339b97cf21ae552db49d8ceba39ee3fd3