Merge "Fix the pip bounds error when entering pip mode." am: 785394eb am:...

Merge "Fix the pip bounds error when entering pip mode." am: 785394eb am: 5383d672 am: 3ed77457 am: f5fc2c1a am: bacfab10

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



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