tree e1cb53447ec63db3bcaa678934c3d36e5ab5e839
parent a81bb0fc12a9769cda734069250c44b8c7d35012
parent 4004b8fcdffc8f0918ef7ba7742903f5f8b08d04
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594416209 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594416209 +0000

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

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

Change-Id: I93be85a74b0cdf755e90a975a3cbeda0adc79d43