Merge "Improve dumps for NotificationShelf views" into tm-qpr-dev am: f201b1bc am: c716bb56

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



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