Merge "Merge "Add traces to the main thread inflation of NotificationHeaderView and HybridNotificationView" into udc-dev am: 8386f847 am: d1d82c71" into udc-d1-dev-plus-aosp am: 8afce4b0

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



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