[automerger skipped] Merge "IStats HAL: Stable AIDL interface update to...

[automerger skipped] Merge "IStats HAL: Stable AIDL interface update to version 2" am: 1ea23229 am: e676f144 am: 8b6c7807 -s ours

am skip reason: Merged-In I8f5f3dfd02eaed7bc1b1566c3ac18307febc6862 with SHA-1 3138abb5 is already in history

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



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