Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I982bdc04ad210f7055f46fa1c5e6e7fe07212dd0
Change-Id: I98a36fd3519bb6b7507ed0384c4c58ba220ae456
tree: 8dc469e64364fb85fbfbfebe72e96676963beb43
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS