Merge changes from topic "magnification_settings" into udc-dev am: 9c31e293 am: 21c2b6ba

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



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