Merge "Support the location injection in AIDL HAL"