[automerger skipped] Merge changes from topic "cherrypick_work_profile_fix"...

[automerger skipped] Merge changes from topic "cherrypick_work_profile_fix" into tm-qpr-dev am: f265073f am: 22b69480 -s ours

am skip reason: Merged-In If17dad36461a5877678cd0cd0e2fceee7591a718 with SHA-1 cfaa5a5f is already in history

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



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