Snap for 6330721 from 4962fa23ef5080ace4f20944f46f7f124f149e44 to mainline-release

Change-Id: I913137c6951f09f1eb1af322fdd62e3ebe088f4f
tree: d039b8d72ce3eadb093e9268350a1405347d2b4d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml