Merge 723a9847c6ee5707e2abae4f2891e540306fde1b on remote branch

Change-Id: Ia5826f29b079f696ce762ba116639488f51f464c
tree: 92593902843e22d480301c354dd93571b7a6336f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS