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

Change-Id: I7a7c34980507393ec855c9e161ca0a922ed57fe4