Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I7faa6a1d71e74f239b9f87991c0c5bd7549143e7
Change-Id: I389c42db5facfc3cafbe7f030d3781cffa70dda8
tree: 65cea4a7b0925e188b058549afe3174218eb6240
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg