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: I9c6c6b714a91fda61b5e52008db0978f4b62362c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>