Merge "Privileged EDI is not considering all privileged apps using isPrivilegedApp method" into android12-tests-dev