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