Merge "Contacts: Remove useless dependency and LOCAL_PRIVATE_PLATFORM_APIS" into r-keystone-qcom-dev