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