Merge "Launch activities in another task if the metadata is set." into...

Merge "Launch activities in another task if the metadata is set." into sc-v2-dev am: 14a90d06 am: 3d86e974

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

Change-Id: I7f4ce2f62faa7e2f9f27c6664b78239b29d31934