[automerger skipped] Fix "Abnormal while playing netflix in PIP mode" am: 48d09516be -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: Ia337d42577a539bc04654b0725dfb9275381c851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>