[automerger skipped] Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9" into stage-aosp-master am: 75b9b48c
am: 369804d4 -s ours
am skip reason: change_id I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25 with SHA1 4b2116ca is in history
Change-Id: I0f58f08e1ae3e5850bd9e7ff8a128867a3d4670f