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: c590e39e

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



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