Merge "Implement two intents or shortcuts to active split" into udc-dev am:...

Merge "Implement two intents or shortcuts to active split" into udc-dev am: 6b550d94 am: fa6e4130

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



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