Merge "Add null check for resolveInfo and Automotive feature." into rvc-dev am: 97c9d1f8b2 am: f67ec51b06

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

Change-Id: I388f7687be8c2f72dc8741eff68b69694def2f7d