Revert "Check if AID is equals to ISD_R_AID."

This reverts commit 5ffe8d2a.

Reason for revert: causing merge conflict while reverting curlprit cl ag/27163141 for the regression b/363412105, b/369170606
Reverted changes: /q/submissionid:28659491

Change-Id: Ib5f6bcc0f86253c200f68e85a037847e1fae0e8c