Merge "Adjust padding in expanded portrait shade" into tm-dev am: 98595fec am: 0a301641 am: 6293e4d8 am: e60066f0

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



Change-Id: Icca8cf22187d1593bef1781740a9be43a8a68044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>