[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: b40b37910d am: 4a8c67bbe8 am: e7b3423bcd
am: ecf5eb46d2  -s ours

Change-Id: I925384485d908b03f6915d0739e64dcac672416f