[automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 am: 721fa921ef -s ours am: ae874c3072 -s ours

am skip reason: Merged-In I9797197a63ed9574caaba7319d0b058821bdab36 with SHA-1 23e05492ba is already in history

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

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