Merge "Fixing notifications side margins in large screen portrait" into tm-dev...

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

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



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