Merge "feat(#AlwaysOnMagnifier): Add haptic and buffer zone when panning scale...

Merge "feat(#AlwaysOnMagnifier): Add haptic and buffer zone when panning scale to persisted scale" into udc-dev am: 42139e0e am: b8aab1fe

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



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