Merge "Fix work tile setup when adding work profile" into tm-qpr-dev am: 52009a5c20 am: e806063bd7

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

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