Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: Icb7b03ca404c32460b1bea7d94a4d891d707134b
Change-Id: Ia79fee25e05205f539ed9b79a80ee12109db38b3
tree: 33f684fad1b62c4b087738cb8c51a817de70509f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. proguard.flags