[automerger skipped] Merge "Fix venue info notification not displaying" into...

[automerger skipped] Merge "Fix venue info notification not displaying" into rvc-dev am: b4167ae2 am: 7afec383 -s ours am: 8ca5bfd1 -s ours am: d87ebee7 -s ours

am skip reason: Change-Id I9ce908cebdef81bb524353219f7ee9ead2487056 with SHA-1 1072efff is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11685294

Change-Id: I8b223b4f3c9a73221dcd5c03c892d4955de5a4b3