Merge "Add @UnsupportedAppUsage annotations"
am: cf03906edc

Change-Id: Ib760897a2d3de2672b4f19d66e238ebee9bfb239