Merge "Add @UnsupportedAppUsage annotations"
am: d717c04b12

Change-Id: I8f8c9106b494caa6dc5ad405111f2a285a01e49f
tree: 24407e5e0c7d7e14d8c58f3bb133ca32c03ed593
  1. core/
  2. services/
  3. tests/