[automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 am: 57af3050d2 am: f7c195b4e9 am: ccdf929a26 -s ours
am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 5fbeff59df is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937196
Change-Id: I3e27d71a9a35b6439b15f6a238f6e1db0f6984f6
This commit is contained in: