Snap for 7318334 from 229667dabb9df32bb7611ddb107cd2a6fb6b02ff to sc-d1-release

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