[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee am: 02f43694e4
am: 84256d8d0f -s ours
am skip reason: change_id I9c2f8347952f3cc65759472b0e1a2717b285e44e with SHA1 e30e3928f9 is in history

Change-Id: Ibaf1e8320f8603c5eb6d33a4a4c862e9dbc2559f