Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8d am: 2474419a

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



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