Merge "[automerger skipped] Merge "Fix lock held error when setting DO for AAOS" into sc-v2-dev am: a8e9fdeb4f -s ours am: 56e3b309ac -s ours" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
a08c1a99f1