[automerger skipped] Merge "Indicate PiP animation type from Launcher to SysUI am: a1a91b0c50 am: fcc8994dd2" into rvc-d1-dev-plus-aosp am: b3e08f79cc -s ours
am skip reason: Change-Id I617a17fd5f6049d9f1d49f9f834623a2bb49f6ca with SHA-1 a1a91b0c50 is in history

Change-Id: I42c8cbb04fcc1a9ca31c3ace8ee7655857c0fe65