Merge "Removed strong zoom as shade starts to be pulled" into sc-dev am: c1dfb44dd1

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

Change-Id: I8a95f931adb5d019cc88720ab6e993fce9fa74a5