[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: a4be791434 am: 2d41b1b460
am: d0f367e71e  -s ours

Change-Id: I91d3eff552dc3772db72c8f0679dac3bd1743212