Snap for 8562061 from 88b36a2d4030eea70bb4167fe16d9a8658fda835 to mainline-media-release

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