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

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



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