Merge "Add missing lock." into tm-qpr-dev am: 1db328df8a am: c83d275401

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

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