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

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

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

Change-Id: Ib22ce5b5eb05e456f897ac96c6bdd1d0e6c8a6ec