Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
am: 2474419ac8
am: 7034984e19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254 Change-Id: If5aa32d9a6139fcfdfbe3618950364a26f213250 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: