Merge changes from topic "am-b6ec94bdf2b444939a7fd8ca85dacc63" into tm-qpr-dev-plus-aosp

* changes:
  Merge "RESTRICT AUTOMERGE Modernize alternate bouncer logic" into tm-qpr-dev am: 11a9620697
  RESTRICT AUTOMERGE Modernize alternate bouncer logic am: 5b5fa66779