[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3b358c7c6d am: 79a76542d3 am: a20f0f5d88
am: aa0b18ab4f  -s ours

Change-Id: I185807dc7bc885076201542fde5ff1aa75e681b7