Merge 8ecfa7d0a696444d67a69bc0426fcc9f4e401ae4 on remote branch

Change-Id: If3724196e54ba52709ea2d77746e5053a85e0c1d
tree: ccb336647a05be8420ae64ee6d356c6887e29078
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. lint-baseline.xml
  6. OWNERS