Merge "Avoid NullPointerException in MediaRouterService" into tm-dev am: 3f58f8161f am: 5d501a9bfe am: 41299f59d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18436784 Change-Id: I07be1ac29e5be9c23f9196555f0372be22a96161 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: