[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769a3 am: 1d526c114f am: 92019fc32e
am: c7619a160d  -s ours

Change-Id: I8149b911ac7d74ab879579ea3d4f57be41bf2c14