[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 6d891937a3 am: 4373a4d763
am: 5d1b9f6ef8  -s ours

Change-Id: I7986a3df145e33fa9167da5212b431c3a560e094