Move Contacts to /product

This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product.

Also make it depend on its privapp permission grants.

Bug: 122353713
Test: launch contacts on aosp_arm64 emulator
Change-Id: I71b4432d6ada09f8d0175491f12a3225aa9f21f1
diff --git a/Android.mk b/Android.mk
index 4a6a325..2f177a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,9 @@
 
 LOCAL_PACKAGE_NAME := Contacts
 LOCAL_CERTIFICATE := shared
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.contacts
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 63f1939..a9f59cc 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,8 +43,8 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Contacts_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Contacts)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Contacts_intermediates)