Merge "Removed strong zoom as shade starts to be pulled" into sc-dev am: c1dfb44d am: d6810706 am: 70e03110

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

Change-Id: I1c5926cc4e23baf128946c7fc1a629852d16f5e0