Merge "Use larger frame of settings button for clicks" into tm-dev am: 014c3b07 am: 0ba3b7f3

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



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