resolve merge conflicts of 9f523b4 to nyc-dev

Bug: 32219099
Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd
Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74
(cherry picked from commit b7eecdd9a1276b721bb9644a0762dfd969e52709)
7 files changed
tree: 84b40d40ec63ab96aada59819aee639a9232432c
  1. AndroidManifest.xml
  2. TestCommon/
  3. assets/
  4. build.gradle
  5. icons/
  6. res/
  7. src/
  8. tests/