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: b16ad290 am: 2bd5ffcc

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

Change-Id: Ib822d6b0e89a141cf8d0eb68f83ac16ba70b2929