[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: ccdf929a -s ours am: c9c77fdd -s ours

am skip reason: Merged-In I2ede0d639a560f6acacec3864a0a7d23af152ba5 with SHA-1 5fbeff59 is already in history

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

Change-Id: I83d13053360d4a1835cd1292a6de3f9b80027995