Merge "Trace ImageFloatingTextView and NotificationToplineView" into udc-qpr-dev am: c39845ac36 am: 6c2efccbc1

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

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