[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 am: 8ab686ab -s ours am: 9a393d64 -s ours

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

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



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