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