Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I02f73bd7958351ee320103d6b23accefd1e7cf60
Change-Id: I1e8ea62fb7f55716ff0da7c01e553847e674cfa7
tree: 5bcf2e52736906328837253694adaa4ccf4ab3f7
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg