Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d

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



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