Merge "aconfig: fix set_state_early bug number" into main am: e2c0a826 am: b729fb2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3065362



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