Merge changes from topic "am-92845cf9d8834af9a173ed2bd113e956" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-dev am: 55dcec46 am: 7461be09 am: bbd74617 -s ours am: f889ff2f -s ours am: 95caed28 am: bb91b336 -s ours am: df544045 am: cd1bc2fa
  [automerger skipped] RESTRICT AUTOMERGE am: 59ba1518 am: d903a3ef am: f439ddfe -s ours am: c098f631 -s ours am: ab1a6de6 am: ed51303d -s ours am: 43cba04a am: 63be14f1