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

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

Change-Id: I4fd39fe50a46c96cf1508dcd4e107576fe39d88c