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

Change-Id: I927ed3371a0f6df6182999fb188d040af28289e6