Merge "Merge "More accurate notification panel logs." into rvc-dev am: 0e934737 am: 24096646 am: e97e49b3" into rvc-qpr-dev-plus-aosp am: 265c8490

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

Change-Id: Id1562e220c3b8da73013facf7ebf50a2295e47a4