[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: deea5f2205 -s ours

am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399

Change-Id: I005f183fdbf40be59143ee48f6b52b70d2de3165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 28bfd4a3132103c24f7608c766901b0664d53735
  1. powerstats/
  2. device.mk