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

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



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