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

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



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