Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5" into stage-aosp-master
am: 75b9b48cec

Change-Id: I453444e35642df4effb287d2cd92558f8276cc14