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

Merged-In: I32d8460d2b44a284752d952051513592e65d49c8
Change-Id: I36803f7c2ea81a81fa3ab3cf994d960f6b3f05ec
tree: c22bc89a79cc83e0a8aa33311e83b6913af2b7e0
  1. 29/
  2. 30/
  3. R/
  4. S/
  5. Android.bp
  6. OWNERS