[automerger skipped] Merge "[DO NOT MERGE] Add Atom logging for ADPF...

[automerger skipped] Merge "[DO NOT MERGE] Add Atom logging for ADPF Telemetry" into tm-qpr-dev am: 08ea7a84 am: 94dd5f8a -s ours

am skip reason: subject contains skip directive

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



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