Snap for 6516244 from 7810c8734e1d86abecf07d9537210cf42b040153 to sc-release

Change-Id: Ie14986c80a097b84b56222fd61224b8121b10a84
tree: caa3460fd4acb36ddfb30a917a8ba8ccd465a3c8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS