Merge "Remove padding logic designed for old position of the expand button"...

Merge "Remove padding logic designed for old position of the expand button" into sc-dev am: fc0a05e3 am: 742910ae am: 5fa3b67f

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

Change-Id: I0207790de1a36db29125b945667c2e54d2a81481