[automerger skipped] Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636
am: 03ebcc2474
-s ours am: 2927d0b9d8
-s ours
am skip reason: Change-Id If6acf305c44085e502a3304ea57e409ce049b40f with SHA-1 b409b64045
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792910
Change-Id: Ide7faff89ec9de7789dd5dd97482d13789c1274c
This commit is contained in: