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

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

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



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