Merge "Revert "Implement two intents or shortcuts to active split"" into...

Merge "Revert "Implement two intents or shortcuts to active split"" into udc-dev am: 4bc89a73 am: f32e8038

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



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