[automerger skipped] Merge "Revert "Remove pip resize flicks" DO NOT MERGE"...

[automerger skipped] Merge "Revert "Remove pip resize flicks" DO NOT MERGE" into tm-qpr-dev am: 052ffcf8 am: 30aa7762 -s ours

am skip reason: subject contains skip directive

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



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