Merge "Adjust padding in expanded portrait shade" into tm-dev am: 98595fec...

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

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



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