fix google location services for aospa
Revert "display: Switch to the qcom/CAF variant"

This reverts commit ea381ad8405a44ef3868b2b593ce3e9010d97993.