Merge "Merge "MediaRouter2: Prevent printing same logs from different lines"...

Merge "Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dc am: e0d455c9" into rvc-d1-dev-plus-aosp am: adf965c9 am: 27a9dd84

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

Change-Id: I6f05d1b8c1397eee390ce73d1f63570ca8d529dc