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

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



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