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

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



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