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: Icfbc1b25da09b04b89028e07d079e90280419578