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

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



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