[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: d9381f5e56 am: e2a6ad99ae
am: 29779732e6  -s ours

Change-Id: Ib552ea746445cab85d956d48a1a00309d910dcd3