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

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

Change-Id: I0af45b717ade186766ae125e8a659d15da2714ee