Merge "Fix ActionButtons background and ripple" into sc-dev am: b6475f9e57

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

Change-Id: I3b814dab33ee9a919f04bce4b534eca2f1a69cca