Merge changes from topic "istats_repeated" am: 73dcda7ead am: 8d2b4331e2

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

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