Merge "Merge "Fix the pip bounds error when entering pip mode." am: 785394eb am: 5383d672 am: 3ed77457 am: f5fc2c1a am: bacfab10" into udc-qpr-dev-plus-aosp am: 9a037c68

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



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