[automerger skipped] Mark ab/7061308 as merged in stage. am: 153f7cfb9d -s ours am: 5cddfd81ca -s ours am: f24607f75e -s ours

am skip reason: Change-Id Ie6873fc615366f3142b071e0adaf2621bd2a0f01 with SHA-1 569d1519fd is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8239d85e09f1f9c378cf6668aa39bbae6bd80873
tree: b7212da1e9c73ad979a8ca24125aeea4e1bd7ff2
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS