Merge "SurfaceFlinger: fix no small window displayed in PIP mode of DTVKIT [1/1]" am: cb8eb2be57 am: 5c1bc9bc86

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia641870da28966a0746ddf85f8379200c8f128e5