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

Change-Id: I6bfbb646ec3c2e65c75bbf7bd666e5c9a02a96c8