Merge "Adjusting horizontal margin of notifications in split shade" into tm-dev am: b645442e am: 38e8f7a0

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

Change-Id: I73d2f3a54f994e0f6f776c4ad639eb70a774f147