Merge "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" into rvc-qpr-dev-plus-aosp am: 1e2bb682

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

Change-Id: I542aa8ba5e8efae46606e12ee8ab794f17c2ea20