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

Change-Id: Ic764fcddea25f27f24e97226951a0f48665a11ab