Snap for 7460045 from 046bfe66d77ef85065c0687de2b2e700d5f0a3c9 to sc-v2-release

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