[automerger skipped] Merge "statemachine migration from base to modules-utils"...

[automerger skipped] Merge "statemachine migration from base to modules-utils" am: 51e6e8a0 am: 8cc1782b am: 4ecafadd am: d712bd40 am: aaa865f8 -s ours

am skip reason: Merged-In I65303c131f6e867f6c44d14baa537560fa8bf857 with SHA-1 ee59c1ee is already in history

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



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