[automerger skipped] Merge "Fix lock held error when setting DO for AAOS" into...

[automerger skipped] Merge "Fix lock held error when setting DO for AAOS" into sc-v2-dev am: a8e9fdeb -s ours am: 56e3b309 -s ours

am skip reason: Merged-In I7beef692f01e32e0724273d2f9773e051c81c331 with SHA-1 6bbbf704 is already in history

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

Change-Id: I11c33d4dcff3e55c50bf4c841b1f0d34a21d17a0