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

Merge "[automerger skipped] Merge "Fix lock held error when setting DO for AAOS" into sc-v2-dev am: a8e9fdeb -s ours am: 56e3b309 -s ours" into tm-dev am: a08c1a99 -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: I659883b5b47e5804bdee364a9b92fcff7a985233