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

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

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



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