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

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

Change-Id: If771444aa57765f0086c79cb64a4b3bae4645b29