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

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

Change-Id: I26eb01882ae5e9b8d1d682b31ddc1e337f2fad1a