Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2

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

Change-Id: I0bf46422d4f7d2621a33776a4c98375d566af117