Merge "Do not reset surface when entering PiP" into tm-qpr-dev am: a6c8c2af am: 72fd1f7e

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



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