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