Merge "libtimeinstate: fix potential optimized variable" into main am: abc21dc68d am: a25b319832

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

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