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

Merged-In: I24fb9c25522accfc4354d176207a9851dd018a3b
Change-Id: Ia0563707c50e37047031f278c89f590eeff2c1cc
tree: d3f5fca1312986af0f2c6e9136f6e8c0f3f192f8
  1. apex/
  2. Android.bp
  3. OWNERS