tree 9667b9e5ef4f0363f2679637c5b5829b0b1c9fc9
parent 4e72b9846ee983b8886ed3bfba8d85f04398d152
parent 793ddfa8d1292a588dacc1c10d6fbdbb54d0af93
author Silvia Vinyes <silviavinyes@google.com> 1668179823 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1668179823 +0000

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

am skip reason: Merged-In I473867eb37ae6d862759ab1f4fad95bb7bb96616 with SHA-1 fedad29a41 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>