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 am: 4b421214

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



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