[automerger skipped] Merge "Ensure only internal display display interactions...

[automerger skipped] Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b am: 793ddfa8 -s ours

am skip reason: Merged-In I473867eb37ae6d862759ab1f4fad95bb7bb96616 with SHA-1 fedad29a is already in history

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



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