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: 991302b7

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



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