Merge "Fix the issue widget retore doesn't play well with work profile" into tm-dev am: 476efd5f

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



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