Merge changes from topic "am-9452c6fc0aaa4f649d955bebf50de5b6" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix BAL via notification.publicVersion" into udc-d1-dev am: 07be682488 -s ours am: b5acb73fd1 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix BAL via notification.publicVersion am: daed0a712a -s ours am: ac97d37049 -s ours