Merge "libtimeinstate: check for invalid buckets when reading map" am: 3d67213a5a am: 163539803c

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

Change-Id: Ifa239ef4ddad86c3fcf6d743f3e94db7c2dc017b