Merge "Add @UnsupportedAppUsage annotations"
am: 3683071fe2

Change-Id: I694c02ed61470d771789eccd32b999494403482c