[automerger skipped] Merge "Update MediaProjection logging atoms for new windowing metrics" into aosp-main-future am: 97e85b3830 -s ours

am skip reason: Merged-In I456f974bf37af39882ef011bf60f724670ea8dae with SHA-1 d6615c072b is already in history

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

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