[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 5d256870aa am: 42f62d86b5
am: 2714fef0e5 -s ours
am skip reason: change_id Id84ee490f3435a196fca10a89bda9f7217b750c6 with SHA1 f650e3c286 is in history

Change-Id: I97c3b113e9d1a110e3abf6f088806ee2155a5724