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: 1087d302

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



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