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

Merged-In: I655f2402558a0dbfa5f96346e7f857c96c0166c9
Change-Id: Ife37bccc1772b793e935f93d806526c20aa46d93
tree: 2989a5ca8d84f90442eab9a1aa02f3710278ec51
  1. 29/
  2. 30/
  3. S/
  4. OWNERS