Merge "Update auto revoke deeplink action javadoc: extra -> Uri" into rvc-dev