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

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



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