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