[automerger skipped] [DO NOT MERGE] Skip testResetPasswordTokenUsableAfterClearingLock in P
am: 8fa940357f -s ours
am skip reason: subject contains skip directive

Change-Id: I11e544d842ddc38a2d08b4e79702f1db951a6d82
tree: 8459d667417fa1da7f804c29b05d4bae5c430dd0
  1. common/
  2. tools/
  3. Android.mk
  4. test_defs.sh