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

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

Change-Id: I846b2cab8808616ad6251ae628c2d178cd82e2fe