Merge "Update javadoc for adoptShellPermissionIdentity"