Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Idfc38208d8b1c7ece8fd7681993df45ecbc019e2
Change-Id: I17b1f853fee7ca947fb8cf7c1328390455da52bd
tree: 802f3f0aae9127818f8d64879a04a08473e6a4ea
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS