Merge "Don't reset to lift reveal - StatusBar will take care of that." into...

Merge "Don't reset to lift reveal - StatusBar will take care of that." into sc-dev am: 1fe82cc6 am: dafd061c am: a0c83b31

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

Change-Id: I5d3c23478c80393db48985d23ffb60da67195893