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

[automerger skipped] Merge "Continue the pausing process after automatically entering pip" into sc-qpr1-dev am: 705aff35 -s ours am: 9a4f53ed -s ours

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

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

Change-Id: I067b8af8af7cc46d678849dcd934d3550326e3c5