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

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



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