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