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