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: 9e89f224 am: f6aff78c

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

Change-Id: I3260c32313f93be2c4ac8cbab7f10831c5f154e2