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: 894a5c87 am: 4c658d88

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



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