Merge "Fix flaky test for persistent notifications" into main am: b6fc7a6f am: fdd68f47

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3156445



Change-Id: I0635a73774b0db08c401ef2523b2da13b0b359f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>