Merge "Adjusting margins and paddings for portrait shade on large screens" into tm-dev am: 08a6e44c am: d7653099

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

Change-Id: I3113ffcc79fbe894ae263fa1e9a40a7f955ace3e