Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I34b46ad2035d4570da6f68293ecc977916c702aa
Change-Id: Ia72f818198108e8551dfc87ceebe13b62706dd94
tree: 88c16a33397cc2cf42fbdcd19f952a303e6939f6
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml