Merge "Add @UnsupportedAppUsage annotations"
am: 0d9029cf3c

Change-Id: I871ee5c3dbaf7413b8d9f0a8948d48c620733c46