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 am: 86480e37 am: 805b2546

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

Change-Id: Idc5932088260c35ce12e6e41e7505a42c5db65c9