Merge "Move trigger for dialog to change controls settings" into tm-qpr-dev...

Merge "Move trigger for dialog to change controls settings" into tm-qpr-dev am: 7dc6120c am: c01709b4

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



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