[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 3610ca221d am: 72667caaa6 am: f82c47fc72
am: d899ddb581  -s ours

Change-Id: I32801089e8073d1f08d4732fb297b3f37c4a2317