Merge "Fix background bypass via notifications" into sc-dev am: 365d013e am: 32247abd am: 9af2a4b9

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

Change-Id: I4803700b76b1b5fe70906bdc83078453daa0c1ec