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: 07d1c5d9 am: 15c10b51

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



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