Merge changes from topic "magnification_settings" into udc-dev am: 9c31e293 am: 73093c61

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



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