Snap for 6838321 from 6b807644e3af9447bf9df11c0582ba9945c04fec to mainline-release

Change-Id: If88be0c6a4939ab81d7f9fa746d1a9bbb0b929f5
tree: 9429c8c95d1564969152f92f0ab2da61564eb002
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS