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: 8915168f

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

Change-Id: Ia90ed80e0c40e966d982d7ce8d1b196b3644d0dc