[automerger skipped] Merge "Fix "Abnormal while playing netflix in PIP mode"" into main am: 3aa13d0d7d -s ours am: 7c46c7a786 -s ours

am skip reason: Merged-In I11d7c73c8eee4a46383516e8eb672827b26314e6 with SHA-1 7303877bdf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2804753

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