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

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



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