Merge "Revert^2 "Add configuration for defaulting notification behavior"" into...

Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece9486 am: 81fc1b0b

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



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