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

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



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