Merge "Merge "Add null check for resolveInfo and Automotive feature." into...

Merge "Merge "Add null check for resolveInfo and Automotive feature." into rvc-dev am: 97c9d1f8 am: 1c6427b9 am: f2cfeca6" into rvc-qpr-dev-plus-aosp am: c31205f1

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

Change-Id: Ic43085279defae9fe5476483f0e53dc2902cee20