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

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



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