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

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

Change-Id: Ie305821b3bf7eaf59cd89247b907b0dac69c4816