Merge "Remove zoom from app clips." into udc-dev am: 3820c510 am: a9d37a54...

Merge "Remove zoom from app clips." into udc-dev am: 3820c510 am: a9d37a54 am: c47c5edf am: ebe6055e

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



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