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: 681c751a

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



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