Merge "Merge "Disable buttons with no action intent" into rvc-dev am:...

Merge "Merge "Disable buttons with no action intent" into rvc-dev am: fd10b83c am: bcd72970 am: 48468409" into rvc-qpr-dev-plus-aosp am: 44103695

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

Change-Id: I7bc4cfd016c5cf47a74d6a981d6c7ab6e51fbc32