Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for...

Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a25047 -s ours am: f3640afe -s ours am: 5ce7da37 -s ours" into rvc-dev-plus-aosp am: 016d1458 -s ours am: f87397ce -s ours

am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6ad6ca2d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10920692

Change-Id: Ibabccb904d7c7bb63b0162e60e3a7f4a67cb2de4