Merge "Fix bug where shade is infinitely squishy after wallpaper change" into...

Merge "Fix bug where shade is infinitely squishy after wallpaper change" into sc-v2-dev am: 16e1d510

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

Change-Id: I25702d03d27202ab4f43104862b40314ab797e0e