Merge "Remove @UnsupportedAppUsage from whitelist methods"
am: cf20449be1

Change-Id: Ic6f74e76cd387138a56907d88ef8fbe90c88d6cc