[automerger skipped] Merge "Resize PiP on display density dpi change" into tm-d1-dev am: 1061cb16e0 -s ours am: aff4831113 -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: I26375752c1f90695996bc9ab544b6c0407a411e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: