Merge "Don't double lock when resetting jank tests" into sc-dev am: 349c0395 am: 2eda8acb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13661705

Change-Id: I43ae901a8152287249fd1b133ecd1a4c4e64a04a