Merge "Account for DPM state when checking FLAG_SECURE" into rvc-dev am: 331ac296f7

Change-Id: I706d2ac4d76772181877f93820e2d9832d6f799e