Merge "Apply layout param to NotificationShelf only when needed" into tm-qpr-dev am: 0ceb4ae22f am: ddd7d73d42

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

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