Revert "Add device specific entry back." Revert submission 26288713-twoshay-sepolicy-24 Reason for revert: DroidMonitor: Potential culprit for b/327235315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Bug:327235315 Reverted changes: /q/submissionid:26288713-twoshay-sepolicy-24 Change-Id: I250fd1c8415c3c865bffa4504c8c290c0d49fddb