Merge changes from topic "am-e1ddd085b37a46ceb84b4ab84ea62863" into main

* changes:
  [automerger skipped] Merge changes from topic "freezer_binder_callback-udc-qpr-dev" into udc-qpr-dev am: 4763a131 am: 78ec88d8 -s ours
  [automerger skipped] Add callback for binder transaction errors am: 7b3c52a3 am: b6d224f3 -s ours