Merge "Avoid conflict surface reset on auto-enter-pip" into tm-qpr-dev am: d6579ac1

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



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