[automerger skipped] Merge "Refactor HintManagerService locking to fix race"...

[automerger skipped] Merge "Refactor HintManagerService locking to fix race" into 24D1-dev am: c3a6902e -s ours

am skip reason: Merged-In I36670f144bc638143ebbe785885ace8aa957f40c with SHA-1 c0365183 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27101360



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