Merge "Avoid resolving split for activities that requested launching TF" into...

Merge "Avoid resolving split for activities that requested launching TF" into udc-dev am: add110fe am: 64230cc1

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



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