Merge "Adjust padding in expanded portrait shade" into tm-dev am: 98595fec am: d389b784 am: 4e4b716c am: f7af06fc

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



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