[automerger skipped] [automerge] Fix lock held error when setting DO for AAOS...

[automerger skipped] [automerge] Fix lock held error when setting DO for AAOS 2p: 6bbbf704 am: d036f658 -s ours am: a8b4316c -s ours

am skip reason: Merged-In I7beef692f01e32e0724273d2f9773e051c81c331 with SHA-1 335db53f is already in history

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

Change-Id: I4f5ac3a1e288d25aeafb907a61fa92e94b48ca75