Merge "Reduce flicker when split pair switching" into tm-qpr-dev am: 1c2c0b52 am: 46ddfb39

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



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