Snap for 11988867 from 3744f779add58d882088bcda2694c4f051c6cdec to 25D4-release

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