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

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

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



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