Snap for 7468788 from c5d2ef6412d17228972de4f4ea1627a4de1d0d2b to sc-d2-release

Change-Id: Ic5e65dbf379951cd558783a1c46c55b4e3d813a5
tree: b604848d4716b964d68cd9a1114d7febbd772328
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING