Merge "Fix issue where notifications are visible during screen off if bypass...

Merge "Fix issue where notifications are visible during screen off if bypass is enabled." into sc-dev am: f3f485c4

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

Change-Id: Iff791679ab696627f4465607f7fdd2cbd06ca101