[automerger skipped] Mark ab/7061308 as merged in stage. am: 0f95f9aef3 -s ours

am skip reason: Change-Id Id955c23cd4ef7f20518193a7cc3030be5045fc84 with SHA-1 46de5aba9e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cad8a67b900ffc1d24fc55008b42c12172224f2
tree: 857c06d175eb126d3bf461cad47007d867281814
  1. src/
  2. Android.bp
  3. AndroidManifest.xml