Merge "Fix the layout flag for magnification settings" into udc-dev am: 30a68e5f am: 17f5ee00

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21894198



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