Merge "Add traces to the main thread inflation of NotificationHeaderView and HybridNotificationView" into udc-dev am: 8386f847 am: 2b165489 am: 7d1cf481 am: 31979045

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



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