[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 am: 9828a54f -s ours am: b4512b91 -s ours

am skip reason: Change-Id I9ce908cebdef81bb524353219f7ee9ead2487056 with SHA-1 3f5206b7 is in history

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

Change-Id: I2fdc44ec5939ee55b60e5c09d1883c6c77376320