[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: f826ab09 -s ours am: 576ca1c4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie1bd17c553b371efb6ad79a6800b23f2686e1935