[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: fa4ccace61 am: 44787b6aa7
am: 753be22bbc  -s ours

Change-Id: Ia741367c02a1141fe2b211a07fdab1fc572609df