Revert^2 "Perform device capability check when checking device aware permission on"

This reverts commit 10952b0ffdc7e33eba6626f5796fe0d47acc0b3a.

Reason for revert: Test failure has been fixed

Change-Id: Ide2f83363eced7780ced3a22e223b950b57bba9b
3 files changed