Merge changes from topic "presubmit-am-fb2ad2dd2c90444796b6fcab87178f40-sc-v2-dev" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix lock held error when setting DO for AAOS 2p: 6bbbf704a0
  Fix lock held error when setting DO for AAOS