Merge "Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8f am: dbc57de0 am: fb599396" into rvc-qpr-dev-plus-aosp am: 87b3cfeb

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

Change-Id: I84861685ccef6e5a77d60aec4a206655d4731de8