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

Change-Id: Ie6fcc247d98d095cdb6b041a2551f727e4fee7d9