Merge changes from topic "cherrypick_work_profile_fix" into tm-qpr-dev am: f265073f

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



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