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

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



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