Merge "Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a797421 am: 1568d9181a" into rvc-d1-dev-plus-aosp