[automerger skipped] Merge "Merge "Move PiP animation to SysUI package" into...

[automerger skipped] Merge "Merge "Move PiP animation to SysUI package" into rvc-dev am: 0cbb2687 am: 48e6a12f" into rvc-d1-dev-plus-aosp am: 41594456 -s ours am: e76b2e3a -s ours
am skip reason: Change-Id Id0c8ce03fa26952daf5e3687b18b2eb2375b7d20 with SHA-1 85cf41fc is in history

Change-Id: I9e54da93f0aa07ddb1b6441ed544df074160d1ea