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: 8e4707ae

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

Change-Id: I54ea63439c9ccab8e5872243fa6fad8970ea2ef4