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 am: faeb08e4

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

Change-Id: I9f9106939cd1e8e452238190b35c4aaa45093d9c