Merge "Check "cmd add-role-holder" is executed complete before executing next step." into android13-tests-dev