Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-dev-plus-aosp