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

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



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