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

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



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