Merge "libtimeinstate: fix bug when cpu count exceeds CPUS_PER_ENTRY" am: da12b04ec0 am: 4ed7cdaaba

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

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