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

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

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

Change-Id: Iaee5baf877c10aa4b661ca141c13afe61533c31f