Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am:...

Merge "Merge "Do not allow focus on invisible buttons" into udc-dev am: 12305746" into udc-d1-dev am: bd4e3b2f am: 82c5a6c1

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



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