Merge "Merge "More accurate notification panel logs." into rvc-dev am: 0e934737 am: 24096646" into rvc-d1-dev-plus-aosp am: 4c3bb51a am: b8776904

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

Change-Id: Iff2b0760dc0bf6b04d938b691ce4ac403e2fbc2c