Merge "Change the alignment of the foreground preferernce controller" into...

Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2b am: 5f3059ff

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



Change-Id: I7f2a5fc92011f20591e51ce2e64ff4255d9d9c23
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>