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: I521cc3a079168140b49e0645f1d040d8161e3805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>