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: 972bb9dd am: 4bc2f2df

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



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