Merge "Fwk matrix use PLATFORM_SEPOLICY_*" am: 8f7ff5730b
am: 9dda065989

Change-Id: I3c2253dd252773e28cd0198aafcc25097923035a