[automerger skipped] Merge "[DO NOT MERGE] Skip testResetPasswordWithTokenBeforeUnlock in P" into pie-cts-dev
am: 90624959b9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia28ef3a609f2469d95d3ff33fd2954a035eff4f0
tree: 21b972b80c279d2fb50eb21572d9c0239c1353ad
  1. common/
  2. tools/
  3. Android.mk
  4. test_defs.sh