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

Change-Id: I076b6a910f6b6c43b00beb42cdf19502514f2e9f