Merge "Add traces to the main thread inflation of NotificationHeaderView and HybridNotificationView" into udc-dev am: 8386f847 am: 811d52be

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



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