Merge "[automerger skipped] Merge "Add MediaRoute2Info#TYPE_REMOTE_SMARTPHONE"...

Merge "[automerger skipped] Merge "Add MediaRoute2Info#TYPE_REMOTE_SMARTPHONE" into udc-dev am: d92f5155 am: 68a0cfc1 am: 85c81769 -s ours" into udc-qpr-dev-plus-aosp am: e400c8fe -s ours

am skip reason: Merged-In I96cb1e662ac56ba0a46eb3b47a2c2cd687e5f0f3 with SHA-1 d8655225 is already in history

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



Change-Id: I44edb070da30b690391534a9f869d889d6c81ee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>