Merge "Update SplitController to use updated method names." into tm-qpr-dev...

Merge "Update SplitController to use updated method names." into tm-qpr-dev am: bca3324d am: 156e7809

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



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