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

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

Change-Id: I552397609b625c744b31f3ed20487419e0dd4b3e