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

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

Change-Id: I637a4745a679ac40043d776fbe134af44cbddb3e