Merge "Add @UnsupportedAppUsage to methods known to be used by apps"
am: faedae5981

Change-Id: I5263e1aa1a3a14fab7feb15acd3295f11dee0b15