[automerger skipped] Merge ab/AP4A.240925.013 into aosp-main-future am: 72e74d14af -s ours

am skip reason: Merged-In Idfebcfdc00f8514086c4b6e94bb6f269bac75d94 with SHA-1 8f2e04be09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeviceDiagnostics/+/30533290

Change-Id: I2a9cbd6b38b5d7d28678451e7ad01ba3acec11be
Signed-off-by: Automerger Merge Worker <[email protected]>