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

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

Change-Id: I50fac28478347874b71fd3989815cb43c2b4cb76