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: 9d87cf51 am: 380ff510 am: 7cf1bd27

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



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