Merge "Bad lock object." am: c4227ee2 am: 456ec4b9

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



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