Merge "Revert "Change the Ambient Context Manager to return STATUS_SERVICE_UNAVAILABLE instead of STATUS_NOT_SUPPORTED when the detection service is not set up.""