Merge "sm: repoll after handling client callbacks" into main am: ffdc5e4573 am: 4a88822691

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

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