Merge changes from topic "am-565ab711edad47d39e14594ddee85d80" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into rvc-dev am: ba41b02d am: 4e16b6b4 -s ours am: 46f540cb -s ours am: d5337369 -s ours am: 30354234 -s ours am: 18bace29 -s ours am: 93473610 -s ours am: 50eda5e3 -s ours am: 7f74bcb5 -s ours am: c130a29b -s ours am: f63e52db -s ours
  [automerger skipped] DO NOT MERGE Fix BAL via notification.publicVersion am: 75fcbb37 am: 0e60d064 -s ours am: b8835cee -s ours am: bb1253d1 -s ours am: df82e3f6 -s ours am: 70f32f6b -s ours am: 1056c3ab -s ours am: 40014cda -s ours am: 5b7202a3 -s ours am: 06cc092a -s ours am: 2b15fef3 -s ours