[automerger skipped] Merge "Continue the pausing process after automatically...

[automerger skipped] Merge "Continue the pausing process after automatically entering pip" am: d88101f7 am: 343e36eb am: ede512d4 am: c4823165 -s ours am: 5e23a591 -s ours

am skip reason: Merged-In Ibb8b3c48d483dcb96207ec2395a87b31d8eb107e with SHA-1 e84bd0d1 is already in history

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

Change-Id: Iee4de5704450f80ca997db09dda36924c0c3d96e