Merge "Fix b/284496479: Crash when opening App Info page" into udc-dev am: c8af2bdc

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



Change-Id: I631ae45d2db25b57be4439d343344107eb459bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>