Merge "Add a scoped lock injection tool" am: a2170a3d am: 2f2f3eff am:...

Merge "Add a scoped lock injection tool" am: a2170a3d am: 2f2f3eff am: 16d7d69c am: 41c836e6 am: 9bece636

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



Change-Id: I557a4eb624897b2ecb6e16f4c144a9d4b63cf819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>