Revert^2 "Check if AID is equals to ISD_R_AID."

This reverts commit 289c55f3.

Reason for revert: the main culprit cl has been rolled back from the release branch so now rolling back this cls.

Change-Id: I086595dab446ba44caf87f0f3f91a3c86e0c6328