Fix for Factory Reset and Screen lock not working after trusty

Due to lack of rpmb drivers Trusty backed keystore is not working
properly. Because of this we are not able to set screen lock and
do factory reset

Enabling software version of Gatekeeper and Keystore to fix the
problem as they do not use rpmb drivers

Tests Done:
1. Boot the device in MTL nuc
2. Screen lock/ unlock working fine using 'input keyevent 26'
command and After reboot
3. Factory reset working properly

Tracked-On: OAM-132238
Signed-off-by: Ravichandra Appegowda <ravichandra.appegowda@intel.com>

Author: ARavichandra

groups/tee/trusty/product.mk

@@ -4,8 +4,9 @@ PRODUCT_PACKAGES += \
 	storageproxyd \
 	libinteltrustystorage \
 	libinteltrustystorageinterface \
-	android.hardware.gatekeeper-service.trusty \
-	android.hardware.security.keymint-service.trusty \
+	android.hardware.gatekeeper-service.nonsecure \
+	com.android.hardware.gatekeeper.nonsecure \
+        android.hardware.security.keymint-service \
 	keybox_provisioning \
 	RemoteProvisioner
 
@@ -17,10 +18,6 @@ PRODUCT_PACKAGES_DEBUG += \
 	RemoteProvisionerUnitTests \
 	libkeymint_remote_prov_support_test
 
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.hardware.gatekeeper=trusty \
-	ro.hardware.keystore=trusty
-
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:vendor/etc/permissions/android.hardware.keystore.app_attest_key.xml