Merge changes from topic "istats_repeated" am: 73dcda7ead

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

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