Merge "Fix exception when opening App info on work profile" into tm-dev am: 9b6a9578

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



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