Merge "Add @UnsupportedAppUsage annotations"
am: b558baa4cc

Change-Id: Id0ca3478dd2a29ded6ef0f8c8a9eabfe7a304449