Merge "Merge "Add null check for resolveInfo and Automotive feature." into rvc-dev am: 97c9d1f8b2 am: 1c6427b940" into rvc-d1-dev-plus-aosp am: 4004b8fcdf

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

Change-Id: I93be85a74b0cdf755e90a975a3cbeda0adc79d43