[automerger skipped] Merge "Fix background bypass via notifications" into...

[automerger skipped] Merge "Fix background bypass via notifications" into qt-dev am: 22500563 am: 57af3050 am: f7c195b4 am: 159542ac -s ours am: fe08620a -s ours

am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 14c1c7b4 is already in history

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

Change-Id: I51905f5d7b8e26a129429ede3e000187bd81ac10