Android 7.1.1 Release 61 (5787798)
resolve merge conflicts of 9f523b4 to nyc-dev

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