Merge "Add @UnsupportedAppUsage annotations"
am: df82ab2de2

Change-Id: I05a2fa49b9400036f3388709e54f0165737887ee