[automerger skipped] Merge changes from topic "istats_repeated" am: 73dcda7ead am: 8d2b4331e2 am: cd98f5dd10 -s ours

am skip reason: Merged-In Idb17804e8ed1d6dd30d1421d2f8bdb65a0906f6d with SHA-1 d4f479322d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2337147

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