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

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



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