Merge "Fix emphasized button drawable to avoid ripple shape glitch." into...

Merge "Fix emphasized button drawable to avoid ripple shape glitch." into sc-dev am: fee0ac21 am: 6f623845

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

Change-Id: Icde9030c4a5b1a0a119c1b5c3a48bd8530216249