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: Ia47133d40f6a665d1728697c85d86e2760d8a59c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>