Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc
am: 053a9f12e4

Change-Id: Id5ba379057d3874b78391c312cfb903799617d81
tree: 053c9db389f05b0f25d557f30f207f76c2f5b562
  1. framework/
  2. OWNERS