Merge cherrypicks of ['ag/20724733'] into tm-d4-release.

Change-Id: I218492a4561d6e14ff9fe3ea4f65c304e7eabd93
tree: b7c29e680d2042f1d5d6fe5619a24da876113629
  1. proto/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. proguard.flags