Merge "Merge "Prevent NPE in NPVC when accessing HeadsUpAppearanceController" into udc-dev am: 4ccef5d1 am: 82826f8e am: 96ad5763" into udc-qpr-dev-plus-aosp am: 4d069026

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



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