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

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



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