[automerger skipped] Merge "Add MediaRoute2Info#TYPE_REMOTE_SMARTPHONE" into udc-dev am: d92f5155e9 am: cf13d9bb47 -s ours am: be027a7b8e -s ours
am skip reason: Merged-In I96cb1e662ac56ba0a46eb3b47a2c2cd687e5f0f3 with SHA-1 d8655225e8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23791647
Change-Id: Ie61fe55a05579b6903ec6c929f8178089f93765d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: