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

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

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