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

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



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