[automerger skipped] Merge "[automerge] DO NOT MERGE Merge state producer and...

[automerger skipped] Merge "[automerge] DO NOT MERGE Merge state producer and feature producer. 2p: e5c6ad5d" into sc-v2-dev-plus-aosp am: 56b99c55 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia16ed5caf2eb089789c54b797a90628ecbe2920e