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: I7d5b8003fee5f01cb72b1723ada2391f32f62139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>