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

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

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

Change-Id: I3a2f0e00a7931836e851cdf219de53c84d7d7880