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

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

Change-Id: Ide930d31f5976435f3a340926686e9ebb175f0c3