Merge "statemachine migration from base to modules-utils" am: 51e6e8a0e1

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

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