Merge "[automerger skipped] Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5" into stage-aosp-master am: 75b9b48cec am: 369804d4e4 -s ours am skip reason: change_id I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25 with SHA1 4b2116ca79 is in history"