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

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



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