Snap for 6611069 from c668f1bc4966f7afc7fc3dacc3b6774690a7bc85 to mainline-release

Change-Id: Ia76511834ef4ba7bf406c5663ab011764c5fdcb7
tree: 287fccf7296c357269e477849162cde5f9b53f1e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS