Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev am: 75948e85 am: 79c2f4d3 am: 563aa32b am: 8416f161

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



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