[automerger skipped] Apply PictureInPictureParam only if it's changed am: 5a70b44596 -s ours

am skip reason: Merged-In I2f1b827747818e07de4aba2763a5cac896354a61 with SHA-1 33eb97afd7 is already in history

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

Change-Id: Ie22915dbd10f4827433728816a51d4e179b526b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>