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

Change-Id: I9cd94d84ca34ce0028b13108744b33ac6d86098c