Merge "Do not remove surface when resetting previous PiP" into udc-qpr-dev am: 2307caae

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



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