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

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



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