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

[automerger skipped] [automerge] DO NOT MERGE Merge state producer and feature producer. 2p: e5c6ad5d am: 90d8d3a4 -s ours am: ac17eb5f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I24d2a5c02e6faba0042ca149761ea24d68ba8ad3