Merge "Ensure only internal display display interactions are logged." into...

Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev am: 6bb34e9b

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



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