Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a797421 am: 8e4707ae80 am: 86480e3767

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

Change-Id: I014385c34e93c6533439b9229b9eea3df75e3f40