Merge "Merge "Don't send split info callback before activity is created" into tm-dev am: 7bc9ba3b am: 130494a4 am: bfded808" into tm-qpr-dev-plus-aosp am: 2c7621af

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



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