Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10f...

Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10f am: 9bfff8cb am: bcc628c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928



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