[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 9137ecafbd am: 2e5fdd0051
am: a0c5ec60b3  -s ours

Change-Id: I05eda58285f86ebeb912b2b8db2889753fa77632