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

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

Change-Id: I9b2ed8ab0c4e16d5a801a3d1c8c2b4d56217fbdd