[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 am: 38a6375f99 am: e54e7590d7
am: d9f2c306ef  -s ours

Change-Id: Ibe022a32cb74d55e365ecc8cd6574479199c5c73