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

Merge "Remove zoom from app clips." into udc-dev am: 3820c510 am: 4a50e394 am: e7087d78 am: add7813e

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



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