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