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: b73412ab

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



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