Merge "Switch android.test and junit classes to use UnsupportedAppUsage" am: 7bb0bcd305
am: b5ccf0e21c

Change-Id: I38729b9ea144ab550741436a7fe1aea99c376a05