Merge "Avoid re-launch button show after split switching" into tm-qpr-dev am: 2b9d5ac7

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



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