Merge "[Re-land] Implement two intents or shortcuts to active split" into...

Merge "[Re-land] Implement two intents or shortcuts to active split" into udc-dev am: d48f9238 am: 8ae1014a

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



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