tree 197113d80386dafbec649a45fc363c7a0bf82ba1
parent 8c3195cb2744303bb51d3d3aaf4a904a8dbf2f50
parent 2438767d5e901dbb45b0d06575953c24795b4b42
author Oli Lan <olilan@google.com> 1649705220 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649705220 +0000

Merge "Bad lock object." am: c4227ee28f am: 456ec4b94a am: 2438767d5e

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

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