Merge "[DO NOT MERGE] Add Atom logging for ADPF Telemetry" into tm-qpr-dev am: 08ea7a84f1

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

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