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

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

Change-Id: I366e1f85592fad283c981541593e03e830f922a6