Merge "Reset pinch gesture on apps without seamless resize" into udc-dev am:...

Merge "Reset pinch gesture on apps without seamless resize" into udc-dev am: c470c58e am: d2c77bda

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



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