Snap for 7468789 from 51ac72fb18162573b4385227df6a68f6a391e948 to sc-d1-release

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