[automerger skipped] Merge "Fix exception when opening App info on work...

[automerger skipped] Merge "Fix exception when opening App info on work profile" into tm-dev am: 9b6a9578 am: 7ec2bb7e -s ours am: 369d0399 -s ours

am skip reason: Merged-In Ibcb40521a5a8374e485932f006049ba676213da1 with SHA-1 b4bf0a85 is already in history

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



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