tree d962687d6b6099cd18a838277f5e3abf5c3a58c5
parent 31ecebec87862fb370558bdce82aa6a6283d790f
parent 705aff35e1f276638da965e1522897ab230655ce
author Winson Chung <winsonc@google.com> 1634107364 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634107364 +0000

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

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

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

Change-Id: Idf5dc9cb1cbe4b98a1912bef1c0f1744c41e8632