Merge "Merge "Update requested state by comparing with source consumer" into...

Merge "Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a7974 am: 1568d918" into rvc-d1-dev-plus-aosp am: 656c7ad0

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

Change-Id: I585f46d9a93da47ae18c451ab225d91299708293