Merge "Bad lock object." am: c4227ee2 am: 456ec4b9 am: 2438767d am: f1f03b8f am: fb6b9075

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



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