Merge "[Home Controls] Add null safety to comparator." into tm-qpr-dev am: 9f572750

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



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