Merge "Update onSubscriptonOverride listener" into rvc-qpr-dev-plus-aosp