Merge changes from topic "am-d2ab013d338f4ded95ae512e858bac4e" into android13-tests-dev

* changes:
  [automerger skipped] Merge "Merge "Privileged EDI is not considering all privileged apps using isPrivilegedApp method" into android12-tests-dev am: e0eec405a5" into android12L-tests-dev am: 2ffdc827d3 -s ours
  [automerger skipped] Merge "Privileged EDI is not considering all privileged apps using isPrivilegedApp method" into android12-tests-dev am: e0eec405a5 am: 588e6ff361 -s ours