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: d389b784 am: 4e4b716c

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



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