[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: e84b5dc01f am: a24340805c
am: 90a2b7663c  -s ours

Change-Id: Ia55af3fa33b56a7c503cef8b1dce130b59acb5f6