Merge "Merge "More accurate notification panel logs." into rvc-dev am: 0e93473703 am: 24096646d8" into rvc-d1-dev-plus-aosp am: 4c3bb51aff

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

Change-Id: I0a0be45181517ea4517cc658961841468dee6e20