Merge "Do not allow focus on invisible buttons" into udc-dev am: 12305746 am: 4b59c5eb am: 50b6bf59

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



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