Merge "Fixing notifications side margins in large screen portrait" into tm-dev am: f7737d0d am: c590e39e am: 561e6f62

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



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