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

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



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