Merge "Fix lock." into udc-dev am: 0f05bfb6

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



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