Merge "Fix the issue widget retore doesn't play well with work profile" into...

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

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



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